viewport: adjustments are never NULL
authorBenjamin Otte <otte@redhat.com>
Wed, 16 Nov 2011 23:25:15 +0000 (00:25 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 16 Nov 2011 23:46:15 +0000 (00:46 +0100)
So there's no need to check for that in the getters.

gtk/gtkviewport.c

index 68bf8f145925d5943e919b2317e1e5b8971b0060..f38da084284946a7c46fde0fb8ee19dbc6612890 100644 (file)
@@ -362,16 +362,9 @@ viewport_get_view_allocation (GtkViewport   *viewport,
 GtkAdjustment*
 gtk_viewport_get_hadjustment (GtkViewport *viewport)
 {
-  GtkViewportPrivate *priv;
-
   g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
 
-  priv = viewport->priv;
-
-  if (!priv->hadjustment)
-    gtk_viewport_set_hadjustment (viewport, NULL);
-
-  return priv->hadjustment;
+  return viewport->priv->hadjustment;
 }
 
 /**
@@ -387,16 +380,9 @@ gtk_viewport_get_hadjustment (GtkViewport *viewport)
 GtkAdjustment*
 gtk_viewport_get_vadjustment (GtkViewport *viewport)
 {
-  GtkViewportPrivate *priv;
-
   g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
 
-  priv = viewport->priv;
-
-  if (!priv->vadjustment)
-    gtk_viewport_set_vadjustment (viewport, NULL);
-
-  return priv->vadjustment;
+  return viewport->priv->vadjustment;
 }
 
 static void